Skip to content

Update swift cataloger to generic cataloger#1324

Merged
wagoodman merged 3 commits intomainfrom
update-swift-generic-cataloger
Nov 4, 2022
Merged

Update swift cataloger to generic cataloger#1324
wagoodman merged 3 commits intomainfrom
update-swift-generic-cataloger

Conversation

@wagoodman
Copy link
Copy Markdown
Contributor

Follow up to #1281 , porting the swift cataloger to the new generic.Cataloger.

Additionally adds the cocopods metadata to the json schema.

@wagoodman wagoodman requested a review from a team November 4, 2022 16:46
Signed-off-by: Alex Goodman <alex.goodman@anchore.com>
Signed-off-by: Alex Goodman <alex.goodman@anchore.com>
Signed-off-by: Alex Goodman <alex.goodman@anchore.com>
@wagoodman wagoodman force-pushed the update-swift-generic-cataloger branch from 3a48467 to 3af2b81 Compare November 4, 2022 16:46
@github-actions
Copy link
Copy Markdown

github-actions Bot commented Nov 4, 2022

Benchmark Test Results

Benchmark results from the latest changes vs base branch
name                                                       old time/op    new time/op    delta
ImagePackageCatalogers/alpmdb-cataloger-2                    16.6ms ± 3%    17.2ms ±28%     ~     (p=0.548 n=5+5)
ImagePackageCatalogers/ruby-gemspec-cataloger-2              1.90ms ± 9%    1.81ms ± 2%     ~     (p=0.222 n=5+5)
ImagePackageCatalogers/python-package-cataloger-2            4.71ms ± 3%    4.48ms ± 5%   -4.89%  (p=0.008 n=5+5)
ImagePackageCatalogers/php-composer-installed-cataloger-2    1.53ms ± 3%    1.37ms ± 2%  -10.44%  (p=0.008 n=5+5)
ImagePackageCatalogers/javascript-package-cataloger-2        1.04ms ± 3%    0.96ms ± 2%   -7.88%  (p=0.008 n=5+5)
ImagePackageCatalogers/node-binary-cataloger-2               8.56µs ± 2%    8.54µs ± 3%     ~     (p=1.000 n=5+5)
ImagePackageCatalogers/dpkgdb-cataloger-2                    1.24ms ± 3%    1.16ms ± 2%   -6.38%  (p=0.008 n=5+5)
ImagePackageCatalogers/rpm-db-cataloger-2                    1.77ms ± 2%    1.64ms ± 3%   -7.08%  (p=0.008 n=5+5)
ImagePackageCatalogers/java-cataloger-2                      20.7ms ± 4%    18.9ms ± 3%   -8.69%  (p=0.008 n=5+5)
ImagePackageCatalogers/apkdb-cataloger-2                     1.89ms ± 3%    1.64ms ± 7%  -13.40%  (p=0.008 n=5+5)
ImagePackageCatalogers/go-module-binary-cataloger-2          8.47µs ± 2%    8.52µs ± 1%     ~     (p=0.548 n=5+5)
ImagePackageCatalogers/dotnet-deps-cataloger-2               1.96ms ± 3%    1.79ms ± 3%   -9.05%  (p=0.008 n=5+5)
ImagePackageCatalogers/portage-cataloger-2                    989µs ± 2%     914µs ± 2%   -7.63%  (p=0.008 n=5+5)

name                                                       old alloc/op   new alloc/op   delta
ImagePackageCatalogers/alpmdb-cataloger-2                    5.27MB ± 0%    5.27MB ± 0%     ~     (p=1.000 n=5+5)
ImagePackageCatalogers/ruby-gemspec-cataloger-2               205kB ± 0%     205kB ± 0%     ~     (p=0.151 n=5+5)
ImagePackageCatalogers/python-package-cataloger-2             962kB ± 0%     961kB ± 0%   -0.10%  (p=0.032 n=5+5)
ImagePackageCatalogers/php-composer-installed-cataloger-2     218kB ± 0%     218kB ± 0%     ~     (p=0.151 n=5+5)
ImagePackageCatalogers/javascript-package-cataloger-2         159kB ± 0%     159kB ± 0%     ~     (p=0.690 n=5+5)
ImagePackageCatalogers/node-binary-cataloger-2               1.12kB ± 0%    1.12kB ± 0%     ~     (all equal)
ImagePackageCatalogers/dpkgdb-cataloger-2                     200kB ± 0%     200kB ± 0%     ~     (p=0.548 n=5+5)
ImagePackageCatalogers/rpm-db-cataloger-2                     302kB ± 0%     302kB ± 0%     ~     (p=0.421 n=5+5)
ImagePackageCatalogers/java-cataloger-2                      3.45MB ± 0%    3.45MB ± 0%     ~     (p=0.421 n=5+5)
ImagePackageCatalogers/apkdb-cataloger-2                     1.26MB ± 0%    1.25MB ± 0%     ~     (p=0.095 n=5+5)
ImagePackageCatalogers/go-module-binary-cataloger-2          1.12kB ± 0%    1.12kB ± 0%     ~     (all equal)
ImagePackageCatalogers/dotnet-deps-cataloger-2                376kB ± 0%     376kB ± 0%     ~     (p=0.056 n=5+5)
ImagePackageCatalogers/portage-cataloger-2                    138kB ± 0%     139kB ± 0%     ~     (p=1.000 n=5+5)

name                                                       old allocs/op  new allocs/op  delta
ImagePackageCatalogers/alpmdb-cataloger-2                     85.7k ± 0%     85.7k ± 0%     ~     (p=0.492 n=5+5)
ImagePackageCatalogers/ruby-gemspec-cataloger-2               4.26k ± 0%     4.26k ± 0%     ~     (all equal)
ImagePackageCatalogers/python-package-cataloger-2             16.6k ± 0%     16.6k ± 0%     ~     (p=0.254 n=5+5)
ImagePackageCatalogers/php-composer-installed-cataloger-2     5.53k ± 0%     5.53k ± 0%     ~     (p=0.079 n=5+5)
ImagePackageCatalogers/javascript-package-cataloger-2         3.33k ± 0%     3.33k ± 0%     ~     (p=0.556 n=5+4)
ImagePackageCatalogers/node-binary-cataloger-2                 38.0 ± 0%      38.0 ± 0%     ~     (all equal)
ImagePackageCatalogers/dpkgdb-cataloger-2                     4.51k ± 0%     4.51k ± 0%     ~     (all equal)
ImagePackageCatalogers/rpm-db-cataloger-2                     8.13k ± 0%     8.13k ± 0%     ~     (all equal)
ImagePackageCatalogers/java-cataloger-2                       57.5k ± 0%     57.5k ± 0%     ~     (p=0.167 n=5+5)
ImagePackageCatalogers/apkdb-cataloger-2                      5.39k ± 0%     5.39k ± 0%     ~     (p=0.238 n=4+5)
ImagePackageCatalogers/go-module-binary-cataloger-2            38.0 ± 0%      38.0 ± 0%     ~     (all equal)
ImagePackageCatalogers/dotnet-deps-cataloger-2                7.24k ± 0%     7.24k ± 0%     ~     (all equal)
ImagePackageCatalogers/portage-cataloger-2                    3.58k ± 0%     3.58k ± 0%     ~     (all equal)

@wagoodman wagoodman merged commit 5ed002e into main Nov 4, 2022
@wagoodman wagoodman deleted the update-swift-generic-cataloger branch November 4, 2022 17:52
GijsCalis pushed a commit to GijsCalis/syft that referenced this pull request Feb 19, 2024
* port swift cataloger to new generic cataloger pattern

Signed-off-by: Alex Goodman <alex.goodman@anchore.com>

* add cocopods metadata to json schema defs

Signed-off-by: Alex Goodman <alex.goodman@anchore.com>

* update json test fixture with latest schema version

Signed-off-by: Alex Goodman <alex.goodman@anchore.com>

Signed-off-by: Alex Goodman <alex.goodman@anchore.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants